Merge branch 'master' of git://git.denx.de/u-boot-i2c
authorTom Rini <[email protected]>
Fri, 27 Nov 2015 13:41:03 +0000 (08:41 -0500)
committerTom Rini <[email protected]>
Fri, 27 Nov 2015 13:41:03 +0000 (08:41 -0500)

Trivial merge